fb56d215709f27eea7e6dd0136e180a758bc4555,src-modules/org/opencms/workplace/tools/content/CmsMergePages.java,CmsMergePages,collectFolder,#String#String#number#,397

Before Change


        Iterator i = folderResources.iterator();
        int size = folderResources.size();
        // now loop through all resources and check them against those in the target merge folder
        m_report.print(size + " "+m_report.key("report.mergepages.pages"),  I_CmsReport.C_FORMAT_HEADLINE);
        m_report.println(m_report.key("report.dots"),  I_CmsReport.C_FORMAT_HEADLINE);
        int count = 1;
        while (i.hasNext()) {

After Change


        CmsResourceFilter filter = CmsResourceFilter.IGNORE_EXPIRATION.addRequireType(CmsResourceTypeXmlPage.getStaticTypeId());        
        List folderResources = m_cms.readResources(sourceMergeFolder, filter, true);
        Iterator i = folderResources.iterator();
        int size = folderResources.size();
        // now loop through all resources and check them against those in the target merge folder
        m_report.println(Messages.get().container(Messages.RPT_SCAN_PAGES_IN_FOLDER_BEGIN_2, sourceMergeFolder, new Integer(size)), I_CmsReport.C_FORMAT_HEADLINE);
        int count = 1;
        while (i.hasNext()) {
            CmsResource res = (CmsResource)i.next();